Cleanup for readability
Version 0.2.1