Better cleaner code