Cleans up syntax in libs and app