ENH: layout

Enhances some of the layout. Update to be done for  docstrings to match
style. PEP8 in progress. :)