Cleaned up again
Switched to Revealing Module Pattern