Indentation fixes, limit calculations