Slightly better margins and widths
Documentation, comments and code cleanup
Documentation, comments and code cleanup