Refactored args a bit