Minor updates
Rearrangement and splitting of class functions.