- Cleaned code a little