Code cleanup for consistency