Minor changes
Working
A lot cleaner