Clean up code
Merge branch 'feature'