Slight optimization and space changes

Slightly optimized the constructor and change the spacing on some
methods.