Cleaner code
Cleaned up code