Code is much cleaner and more functional just cleaning rare instances