Devon's checkstyled code

Merged Devon's checkstyled code and previous code