Second commit

Cleaned code a bit