Code style & cleanup