Also cleaner code, done!