style updates and removed useless code