Fix some indentation
Add more target/idify aliases