Commented kissing and cleaned up the code