Cleaned up file and updated password inputs