Clean up and make file fix. May be broken