Initial cleanup of code style