refactored mars methods, more consistent
donal'd
refactored