Shorten code
Fix indent