Added bcrypt encryption, cleanups