Cleaned headers & added methods

+ Added more organized headers
+ Added new methods