ISSUE #12 - Cleaned up login page code