Cleaned my code a bit!