Cleaned code style right up.