Simplified and starting to follow conventions