Fixed some over-engineering