Clean up + Readme update