Edited style. Clean up code.