code clean up, added style