Cleaned up code, added displaying help if no options supplied