improved UI, removed comments, etc.