Code formatted, imports organized