Small changes to the code style. Some clean up