Fixed some issues. Style fixes.