Adding a few more indicators and cleaning up code