Some small code beautification.
Update project descriptors. Fix keystore not found signing error.