fixed some style issues

- import fixes
- cleared reserved names
- cleared mixed indentation
- changed methods to lower case first letter