Code cleanup
Added a helper for administrative actions