Some method optimisations. Comments added. General cleanups