Cleaned up limit setting code