Add comment, try to clean code