Cleaned a bit more methods