cleaned up build rules