Cleaned up, renamed, moved object initializers and added a potion bottle cleaner thingy majig