Cleaned out unnecessary pieces, moved out of camel case, reduced some clutter.