Updated casing of method names and restructured a few things