Standarizing and arranging code.
Adding missing methods.