Angularified
Remove port specification
fix some indenting cause OCD
fix some indenting cause OCD