Code Cleanup, Add Button