fixed angular issue, started formatting