Code clean up and added usage output