Added comments and cleaned up UI code