diff --git a/Sming/SmingCore/Network/Http/HttpConnection.h b/Sming/SmingCore/Network/Http/HttpConnection.h
index 5b1d7a7a06..6dee6dd9d9 100644
--- a/Sming/SmingCore/Network/Http/HttpConnection.h
+++ b/Sming/SmingCore/Network/Http/HttpConnection.h
@@ -67,13 +67,13 @@ class HttpConnection : public TcpClient
 
 	/**
 	 * @brief Returns pointer to the current request
-	 * @return HttpRequest*
+	 * @retval HttpRequest*
 	 */
 	virtual HttpRequest* getRequest() = 0;
 
 	/**
 	 * @brief Returns pointer to the current response
-	 * @return HttpResponse*
+	 * @retval HttpResponse*
 	 */
 	HttpResponse* getResponse()
 	{
diff --git a/Sming/SmingCore/Network/Http/HttpRequest.h b/Sming/SmingCore/Network/Http/HttpRequest.h
index 7d1cfae138..d5e61afc49 100644
--- a/Sming/SmingCore/Network/Http/HttpRequest.h
+++ b/Sming/SmingCore/Network/Http/HttpRequest.h
@@ -105,7 +105,7 @@ class HttpRequest
 	 * @param const String& formElementName the name of the element in the form
 	 * @param IDataSourceStream* stream - pointer to the stream (doesn't have to be a FileStream)
 	 *
-	 * @return HttpRequest*
+	 * @retval HttpRequest*
 	 */
 	HttpRequest* setFile(const String& formElementName, IDataSourceStream* stream)
 	{
@@ -227,7 +227,7 @@ class HttpRequest
 	 * 			Check if SHA256 hash of Subject Public Key Info matches the one given.
 	 * @param	fingerprints - passes the certificate fingerprints by reference.
 	 *
-	 * @return bool  true of success, false or failure
+	 * @retval bool  true of success, false or failure
 	 */
 	HttpRequest* pinCertificate(SslFingerprints& fingerprints)
 	{
@@ -240,7 +240,7 @@ class HttpRequest
 	 * @param SSLKeyCertPair
 	 * @param bool freeAfterHandshake
 	 *
-	 * @return HttpRequest pointer
+	 * @retval HttpRequest pointer
 	 */
 	HttpRequest* setSslKeyCert(const SslKeyCertPair& keyCertPair)
 	{
@@ -252,7 +252,7 @@ class HttpRequest
 #ifndef SMING_RELEASE
 	/**
 	 * @brief Tries to present a readable version of the current request values
-	 * @return String
+	 * @retval String
 	 */
 	String toString();
 #endif
diff --git a/Sming/SmingCore/Network/Http/HttpServerConnection.h b/Sming/SmingCore/Network/Http/HttpServerConnection.h
index f1d49929b3..0187728a49 100644
--- a/Sming/SmingCore/Network/Http/HttpServerConnection.h
+++ b/Sming/SmingCore/Network/Http/HttpServerConnection.h
@@ -84,40 +84,11 @@ class HttpServerConnection : public HttpConnection
 
 protected:
 	// HTTP parser methods
-	/**
-	 * Called when a new incoming data is beginning to come
-	 * @paran http_parser* parser
-	 * @return 0 on success, non-0 on error
-	 */
-	int onMessageBegin(http_parser* parser) override;
 
-	/**
-	 * Called when the URL path is known
-	 * @param String path
-	 * @return 0 on success, non-0 on error
-	 */
+	int onMessageBegin(http_parser* parser) override;
 	int onPath(const URL& path) override;
-
-	/**
-	 * Called when all headers are received
-	 * @param HttpHeaders headers - the processed headers
-	 * @return 0 on success, non-0 on error
-	 */
 	int onHeadersComplete(const HttpHeaders& headers) override;
-
-	/**
-	 * Called when a piece of body data is received
-	 * @param const char* at -  the data
-	 * @paran size_t length
-	 * @return 0 on success, non-0 on error
-	 */
 	int onBody(const char* at, size_t length) override;
-
-	/**
-	 * Called when the incoming data is complete
-	 * @paran http_parser* parser
-	 * @return 0 on success, non-0 on error
-	 */
 	int onMessageComplete(http_parser* parser) override;
 
 	bool onProtocolUpgrade(http_parser* parser) override