Remaming and documenting
Updated init file
:
Still cleaning up
Cleaning up methods to make them more understandable