Conditionally compile test
Remove unnecessary newline
Clean up code
Clean up code.
Merge pull request #3 from samebchase/samuel-devel

Clean ups