Fix indenting
Move and fix limitiations