Gave some methods more appropriate names
Removed some useless dirty fields