Added return Type for close()
Reformat
Small Fixes