Changed indention style. Organized the file a bit better.