Package declaration & formatting

Added package declaration & improved formatting