Refactored a bit for "Nicer" documentation

and worked a bit on documentation btw