Cleaned up the code by moving some strings to constants. They still need to be configurable, though