cleaner code?