UC001-e fixed login check, cleanup and comments