Resolves #16, code clean up, got rid of hardwareSpecs cs