Applying fixes to respect interfaces

Also applying minor CS and calisthenics fixes