Cleanup; fixed #define