Removed user-specific password and cleaned up code