Modified shapes to have better indentation and also got rid of tab.