Removed redundant includes
Added missing method documentation