Organized code
Organized code
Organized code
Fixed user output. Fixes #1