Feature/coverage statements

Refactor coverage statements. This is just a start and can definitely be improved upon.