clean up code + better presentation