Code refactor & fixes