Button: Code cleanup