style: cleaned-up a bit; renamed some methods and variables for more readability