Cleaned up build a bit