Removed extra methods
Added helper methods
Added documentation