* Cleaned up extra whitespace and left thoughts for the maintainer