quick fixes
removed useless comment
style issues
removed useless? field