Removed empty constructors from both classes