Removed indicator light code and bit more clean up.