Use Disabled function, clean up code

Cleaner code