Cleaned up the code
Began adding options