Made getButtonDescriptions dependent on the state
Removed unneccessary return statements