Cleaned even more code up, less variable declarations