Cleanup
Fix 204, move private methods