Cleanup
Fix warnings and replace custom print with core