Refactoring dummy constructors into native constructors, code cleanup