Fixed: code style
Removed: dead code