Documentation checked, code repetition removed..