Address Julius' review comments