Fairly cleaner code