Code cleanup
Completed the usage screen