Adding packages and additional whitespace trimming