Cleaned up methods & variable names