Fixed spacing
cleanup logic on functionality
cleanup spacing