Removed redundant code. Style fixes.