code cleaned up on post