Clean up some codes and Add a constants class