First cleanup of guards
Merge pull request #13 from bakura10/cleanup-guards-2

First cleanup of guards