Cleaned up project a bit,