- reformatted code
- skip login already working