Removed some dead code
Style fixed