added cleaner service waits and cleaned up action lines
Merge pull request #8 from lwade/master

added cleaner service waits and cleaned up action lines