Added build comments, remove redundant try/catch