Cleaned up code style according to HLint