change codestyles and clean up