cleaned up style in code