removed unnecessary constructor + some cleanup