Jaina

Code cleanup, fixed tabs.