Protection cleanup
Small refactors
Removed unnecessary return statements
Update for 1.5