Fixed issues in review:

1) Removed unnecessary include file
2) Added doyxgen
3) Removed some boilerplate